Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen)

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
	the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index 5eedba88f9cedeb5ea08955ac256f497ff18a6eb..25e43431541ebbd357626053c1f7983c8375f5c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
+       the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
+
        * gtk/gtkimage.c (gtk_image_set_property): Add a missing break
        statement.  (#161172, Damon Chaplin)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5eedba88f9cedeb5ea08955ac256f497ff18a6eb..25e43431541ebbd357626053c1f7983c8375f5c8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
+       the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
+
        * gtk/gtkimage.c (gtk_image_set_property): Add a missing break
        statement.  (#161172, Damon Chaplin)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5eedba88f9cedeb5ea08955ac256f497ff18a6eb..25e43431541ebbd357626053c1f7983c8375f5c8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
+       the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
+
        * gtk/gtkimage.c (gtk_image_set_property): Add a missing break
        statement.  (#161172, Damon Chaplin)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5eedba88f9cedeb5ea08955ac256f497ff18a6eb..25e43431541ebbd357626053c1f7983c8375f5c8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
+       the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
+
        * gtk/gtkimage.c (gtk_image_set_property): Add a missing break
        statement.  (#161172, Damon Chaplin)
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3fbf1716c939b359ff1389006e8b0fe121a5e337..83cd6c1c8af67a7fa9e983d7927737a858575846 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4689,7 +4689,7 @@ gtk_window_real_set_focus (GtkWindow *window,
                           GtkWidget *focus)
 {
   GtkWidget *old_focus = window->focus_widget;
-  gboolean def_flags = 0;
+  gboolean had_default = FALSE;
 
   if (old_focus)
     {
@@ -4703,7 +4703,7 @@ gtk_window_real_set_focus (GtkWindow *window,
     }
   
   if (window->default_widget)
-    def_flags = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
+    had_default = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
   
   if (window->focus_widget)
     {
@@ -4754,7 +4754,7 @@ gtk_window_real_set_focus (GtkWindow *window,
    * is harmless.
    */
   if (window->default_widget &&
-      (def_flags != GTK_WIDGET_FLAGS (window->default_widget)))
+      (had_default != GTK_WIDGET_HAS_DEFAULT (window->default_widget)))
     gtk_widget_queue_draw (window->default_widget);
 
   if (old_focus)